Don't copy missing-file.dfsg to THE-GNU-PROJECT
authorRob Browning <rlb@defaultvalue.org>
Sun, 2 Oct 2016 17:44:54 +0000 (12:44 -0500)
committerRob Browning <rlb@defaultvalue.org>
Sun, 2 Oct 2016 17:44:56 +0000 (12:44 -0500)
THE-GNU-PROJECT is now compatible with the DFSG.  Remove
missing-file.dfsg entirely since it it no longer being used.

debian/missing-file.dfsg [deleted file]
debian/rules

diff --git a/debian/missing-file.dfsg b/debian/missing-file.dfsg
deleted file mode 100644 (file)
index 47ad341..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-
-The file that would normally be displayed here (@FILE@) has been moved
-to the emacs@MAJOR_VERSION@-common-non-dfsg package because its
-license does not appear to be compatible with the Debian Free Software
-Guidelines (DFSG).  Please see
-/usr/share/doc/emacs@MAJOR_VERSION@-common/copyright for more
-information.
-
-Please install @FILE@ from Debian's non-free distribution if you would
-like for Emacs to display the original file.
index 6548970ba0ba5656e93d2a80694aa50373cc80f9..2ef88dedf51662ade753ecbcd984abcb32381705 100755 (executable)
@@ -466,17 +466,6 @@ override_dh_auto_install: $(autogen_install_files)
          dh_link -p$(flavor)-common /usr/share/common-licenses/GPL-3 \
            usr/share/emacs/$(runtime_ver)/lisp/COPYING
 
-         # Install replacements for non-free files that can be reached
-         # through C-h
-         for f in THE-GNU-PROJECT; \
-         do \
-           sed \
-             -e "s/@FILE@/$$f/g" \
-             -e "s/@MAJOR_VERSION@/$(major_ver)/g" \
-             $(CURDIR)/debian/missing-file.dfsg > \
-             $(pkgdir_common)/usr/share/emacs/$(runtime_ver)/etc/$$f.dfsg ; \
-         done
-
          $(pf); cd $(pkgdir_common) && \
            find -name "*.elc" | perl -pe 's/\.elc$$/\.el/o' | xargs rm -f